From: Alex Williamson <alex.williamson@hp.com>
Date: Tue, 2 Oct 2007 15:58:09 +0000 (-0600)
Subject: [IA64] Remove warnings.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14933
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=562999c5a8f9af38cf1f3d465b6332425d1fe416;p=xen.git

[IA64] Remove warnings.

Signed-off-by: Tristan Gingold <tgingold@free.fr>
---

diff --git a/xen/arch/ia64/linux-xen/head.S b/xen/arch/ia64/linux-xen/head.S
index 5c8c60cbb6..89afda7f4d 100644
--- a/xen/arch/ia64/linux-xen/head.S
+++ b/xen/arch/ia64/linux-xen/head.S
@@ -1210,6 +1210,9 @@ tlb_purge_done:
 	RESTORE_REG(cr.dcr, r25, r17);;
 	RESTORE_REG(cr.iva, r25, r17);;
 	RESTORE_REG(cr.pta, r25, r17);;
+#ifdef XEN
+	dv_serialize_instruction
+#endif
 	RESTORE_REG(cr.itv, r25, r17);;
 	RESTORE_REG(cr.pmv, r25, r17);;
 	RESTORE_REG(cr.cmcv, r25, r17);;
diff --git a/xen/arch/ia64/linux-xen/process-linux-xen.c b/xen/arch/ia64/linux-xen/process-linux-xen.c
index e20e60d2f7..f79109ce19 100644
--- a/xen/arch/ia64/linux-xen/process-linux-xen.c
+++ b/xen/arch/ia64/linux-xen/process-linux-xen.c
@@ -569,10 +569,14 @@ do_copy_task_regs (struct task_struct *task, struct unw_frame_info *info, void *
 
 	if (ia64_sync_user_rbs(task, info->sw, pt->ar_bspstore, urbs_end) < 0)
 		return;
-#endif /* !XEN */
 
 	ia64_peek(task, info->sw, urbs_end, (long) ia64_rse_rnat_addr((long *) urbs_end),
 		  &ar_rnat);
+#else
+
+	ia64_peek(task, info->sw, urbs_end, (long) ia64_rse_rnat_addr((u64 *) urbs_end),
+		  (long *)&ar_rnat);
+#endif
 
 	/*
 	 * coredump format: